Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve readability of test targets #1253

Merged
merged 1 commit into from
Apr 30, 2021
Merged

improve readability of test targets #1253

merged 1 commit into from
Apr 30, 2021

Conversation

sssoleileraaa
Copy link
Contributor

@sssoleileraaa sssoleileraaa commented Apr 29, 2021

Description

Use TESTOPTS to improve readability.
Run semgrep in make test and make test-random which means we run semgrep in CI.

Test Plan

  • make test and make test-random still work
  • confirm semgrep ran in CI

@emkll
Copy link
Contributor

emkll commented Apr 30, 2021

rebased on latest main

Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @creviera , minor comment inline, but since it was already there, merging as-is

@@ -67,24 +67,25 @@ clean: ## Clean the workspace of generated resources
TESTS ?= tests
ITESTS ?= tests/integration
FTESTS ?= tests/functional
TESTOPTS ?= -v
TESTOPTS ?= -v --cov-config .coveragerc --cov-report html --cov-report term-missing --cov=securedrop_client --cov-fail-under 100
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the -v here apply to the same pytest command as the v on L74 and L81?

@@ -116,7 +117,7 @@ bandit: ## Run bandit with medium level excluding test-related folders
bandit -ll --recursive . --exclude ./tests,./.venv

.PHONY: check
check: clean check-black check-isort bandit lint mypy test-random test-integration test-functional ## Run the full CI test suite
check: clean check-black check-isort semgrep bandit lint mypy test-random test-integration test-functional ## Run the full CI test suite
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch :)

@emkll emkll merged commit 4e1acf9 into main Apr 30, 2021
@emkll emkll deleted the refactor-test branch April 30, 2021 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants